Auto merge of #1282 - vrinek:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 9 Feb 2015 19:24:58 +0000 (19:24 +0000)
committerbors <bors@rust-lang.org>
Mon, 9 Feb 2015 19:24:58 +0000 (19:24 +0000)

Trivial merge